projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 87c161d 5dc6acb)
bitkeeper revision 1.1159.1.504 (41cc93b0yD09pgWkeLlUepCAam5oFA)
authoriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Fri, 24 Dec 2004 22:09:52 +0000 (22:09 +0000)
committeriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Fri, 24 Dec 2004 22:09:52 +0000 (22:09 +0000)
Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into labyrinth.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk

1  2 
.rootkeys patch | diff1 | diff2 | blob | history

diff --cc .rootkeys
Simple merge
Unnamed repository; edit this file 'description' to name the repository.